From 002b47c4304834e6a26d8788da51958117dd4b12 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 15 Jul 2020 19:31:45 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 484155 -> 484295 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index f1e58670a5c..0fb3328c7b7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -100,6 +100,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 8f4f95a69813886b1f028ed35c01eb1c8b75db13..cfdf76063e5c72e77dd1fe638f3873b120793e90 100644
GIT binary patch
delta 168
zcmdmeO!oM3*@hOz7N!>F7M3lnML+8^(-cZli%S%AD-`rgi;MJ=GV}CP3bNC6lS(sl
zQqpn~(~GSYN-|ROxD+73!!gLk)i2&TAi&MX(LLBU0Zp}nu5Nm2i2_Vs!N^WOCACaH
muQVqofh#SO%h5SLIMgXPL<4LP7s90W{GY7b^MA6P$piowJvg@j

delta 34
qcmX?pTz2;{*@hOz7N!>F7M3lnML(zeo3Kl_Oa5ZrF8PaXT_ynd84bz+

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9..137b6e5e9b7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes:
-- 
2.30.2